Changes to properly (or at least better) version the babl library.

2007-01-01  Kevin Cozens  <kcozens@cvs.gnome.org>

	* configure.ac: Changes to properly (or at least better) version the
	babl library.

	* babl.pc.in: It is too soon to include version information in the
	name of the babl library at link time.

svn path=/trunk/; revision=189

diff --git a/babl.pc.in b/babl.pc.in
index f4dc741f6843091ee1937fa78a75fbd7d01d6e9e..5752e0438ca2ec6feda680a92ab6892711d0ee84 100644 (file)
--- a/babl.pc.in
+++ b/babl.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: babl
 Description: Dynamic, any to any, pixel format conversion library
 Version: @BABL_REAL_VERSION@
-Libs: -L${libdir} -lbabl-@BABL_API_VERSION@ @DL_LIB@ @MATH_LIB@
+Libs: -L${libdir} -lbabl @DL_LIB@ @MATH_LIB@
 Cflags: -I${includedir}/@PACKAGE_NAME@-@BABL_API_VERSION@
 

diff --git a/configure.ac b/configure.ac
index 669811e0689234850892a7bc0d98a8bb8be6f068..4b9e996b4dc1002991736e366b4af82e7f4dd4a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,22 @@
 AC_PREREQ(2.54)
 
+# Making releases on the stable branch:
+#   BABL_MICRO_VERSION += 1;
+#   BABL_INTERFACE_AGE += 1;
+
 m4_define([babl_major_version], 0)
 m4_define([babl_minor_version], 0)
 m4_define([babl_micro_version], 9)
 m4_define([babl_real_version],
           [babl_major_version.babl_minor_version.babl_micro_version])
 m4_define([babl_version], [babl_real_version])
+m4_define([babl_interface_age], [0])
+m4_define([babl_binary_age],
+          [m4_eval(100 * babl_minor_version + babl_micro_version)])
+
+# This is the X.Y used in -lbabl-X.Y
+m4_define([babl_api_version], [babl_major_version.babl_minor_version])
+
 
 AC_INIT(babl, babl_major_version.babl_minor_version.babl_micro_version)
 AC_CONFIG_SRCDIR(babl/babl.h)
@@ -13,25 +24,35 @@ AC_CONFIG_SRCDIR(babl/babl.h)
 BABL_MAJOR_VERSION=babl_major_version
 BABL_MINOR_VERSION=babl_minor_version
 BABL_MICRO_VERSION=babl_micro_version
-BABL_REAL_VERSION=babl_real_version
+BABL_INTERFACE_AGE=babl_interface_age
+BABL_BINARY_AGE=babl_binary_age
 BABL_VERSION=babl_version
+BABL_REAL_VERSION=babl_real_version
+BABL_API_VERSION=babl_api_version
+AC_SUBST(BABL_MAJOR_VERSION)
+AC_SUBST(BABL_MINOR_VERSION)
+AC_SUBST(BABL_MICRO_VERSION)
+AC_SUBST(BABL_INTERFACE_AGE)
+AC_SUBST(BABL_BINARY_AGE)
+AC_SUBST(BABL_VERSION)
 AC_SUBST(BABL_REAL_VERSION)
-
-BABL_API_VERSION=babl_major_version.babl_minor_version
 AC_SUBST(BABL_API_VERSION)
 
-BABL_LIBRARY_VERSION=0:0:0
+BABL_RELEASE=babl_api_version
+AC_SUBST(BABL_RELEASE)
 
+# libtool versioning
+m4_define([lt_current], [m4_eval(100 * babl_minor_version + babl_micro_version - babl_interface_age)])
+m4_define([lt_revision], [babl_interface_age])
+m4_define([lt_age], [m4_eval(babl_binary_age - babl_interface_age)])
+BABL_LIBRARY_VERSION="lt_current:lt_revision:lt_age"
+BABL_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
 AC_SUBST(BABL_LIBRARY_VERSION)
+AC_SUBST(BABL_CURRENT_MINUS_AGE)
 
 PACKAGE_NAME=babl
 AC_SUBST(PACKAGE_NAME)
 
-BABL_VERSION=$BABL_MAJOR_VERSION.$BABL_MINOR_VERSION.$BABL_MICRO_VERSION
-BABL_RELEASE=$BABL_MAJOR_VERSION.$BABL_MINOR_VERSION
-AC_SUBST(BABL_RELEASE)
-AC_SUBST(BABL_VERSION)
-
 AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(no-define)
 
@@ -57,9 +78,6 @@ if eval "test x$GCC = xyes"; then
   esac
 fi
 
-babl_extension_dir="$libdir/babl"
-AC_SUBST(babl_extension_dir)
-
 AC_PATH_PROG(INKSCAPE, inkscape, no)
 AM_CONDITIONAL(HAVE_INKSCAPE, test "x$INKSCAPE" != "xno")